From 9ef2fdf956892b03d94b051642d909839dab7638 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 14 Jan 2012 19:48:40 -0500 Subject: [PATCH] GtkApplicationWindow: another size allocation fix Set the window allocation before giving allocations to children, in case the children want to refer to the window allocation. --- gtk/gtkapplicationwindow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c index 3bf318f3bc..555db917c5 100644 --- a/gtk/gtkapplicationwindow.c +++ b/gtk/gtkapplicationwindow.c @@ -635,6 +635,8 @@ gtk_application_window_real_size_allocate (GtkWidget *widget, gint menubar_height; GtkWidget *child; + gtk_widget_set_allocation (widget, allocation); + gtk_widget_get_preferred_height_for_width (window->priv->menubar, allocation->width, &menubar_height, NULL); menubar_allocation.height = menubar_height; @@ -654,8 +656,6 @@ gtk_application_window_real_size_allocate (GtkWidget *widget, gtk_widget_size_allocate (child, &child_allocation); } - - gtk_widget_set_allocation (widget, allocation); } else GTK_WIDGET_CLASS (gtk_application_window_parent_class) -- 2.30.2